From: Chong Yidong Date: Wed, 24 Jun 2009 14:27:47 +0000 (+0000) Subject: * emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671). X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11794 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c852710b9c111794d926f0f5f35110b8751d65c7;p=emacs.git * emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671). --- diff --git a/src/ChangeLog b/src/ChangeLog index 46611b9799b..54f2184cb72 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-06-24 Chong Yidong + + * emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671). + 2009-06-24 Kenichi Handa * fontset.c (fontset_get_font_group): Return 0 if no font-group is diff --git a/src/emacs-icon.h b/src/emacs-icon.h index 56cd5c601df..0bd216e99ef 100644 --- a/src/emacs-icon.h +++ b/src/emacs-icon.h @@ -20,8 +20,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ - -#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) +/* Note that the GTK port uses gdk to display the icon, so Emacs need + not have XPM support compiled in. */ +#if (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK) static char * gnu_xpm_bits[] = { /* width height ncolors chars_per_pixel */ "32 32 255 2", @@ -314,7 +315,7 @@ static char * gnu_xpm_bits[] = { "OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP", "OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP", "OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"}; -#endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */ +#endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK) */ #define gnu_xbm_width 50 #define gnu_xbm_height 50